From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 27 Mar 2006 16:47:29 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~45087
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fdccffc6b711d1bfcd1e1b569537686dcad423e2;p=linux-4.9.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: drop duplicate assignment in request_sock
  [IPSEC]: Fix tunnel error handling in ipcomp6
---

fdccffc6b711d1bfcd1e1b569537686dcad423e2